Revert r37872 for now -- "(bug 2971) Standardize format of links to hist/diff in...

This appears to have changed "(hist) (diff)" to "(diff; hist)". I'm a bit leery of callign that "standardization" as it changes it from looking like regular Recent Chagnes to looking like enhanced Recent Changes.
Might be good to do a look around at other things, which use for example commas or pipes in parens as well, and figure out which is best to stick with.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 05a404c..e271046 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -190,7 +190,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   the database is potentially queried
 * (bug 9736) Redirects on Special:Fewestrevisions are now marked as such.
 * New date/time formats in Cs localization according to ČSN and PČP.
-* (bug 2971) Standardize format of links to hist/diff in Special:Contributions.
  
 === Bug fixes in 1.13 ===
 

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index bba3f53..4a131f1 100644 (file)
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -162,7 +162,7 @@ class ContribsPager extends ReverseChronologicalPager {
                if( $row->rev_id == $row->page_latest ) {
                        $topmarktext .= '<strong>' . $this->messages['uctop'] . '</strong>';
                        if( !$row->page_is_new ) {
-                               $difftext .= $sk->makeKnownLinkObj( $page, $this->messages['diff'], 'diff=0' );
+                               $difftext .= '(' . $sk->makeKnownLinkObj( $page, $this->messages['diff'], 'diff=0' ) . ')';
                        } else {
                                $difftext .= $this->messages['newarticle'];
                        }
@@ -175,11 +175,11 @@ class ContribsPager extends ReverseChronologicalPager {
                }
                # Is there a visible previous revision?
                if( $rev->userCan(Revision::DELETED_TEXT) ) {
-                       $difftext = $sk->makeKnownLinkObj( $page, $this->messages['diff'], 'diff=prev&oldid='.$row->rev_id );
+                       $difftext = '(' . $sk->makeKnownLinkObj( $page, $this->messages['diff'], 'diff=prev&oldid='.$row->rev_id ) . ')';
                } else {
-                       $difftext = $this->messages['diff'];
+                       $difftext = '(' . $this->messages['diff'] . ')';
                }
-               $histtext = $sk->makeKnownLinkObj( $page, $this->messages['hist'], 'action=history' );
+               $histlink='('.$sk->makeKnownLinkObj( $page, $this->messages['hist'], 'action=history' ) . ')';
 
                $comment = $wgContLang->getDirMark() . $sk->revComment( $rev, false, true );
                $d = $wgLang->timeanddate( wfTimestamp( TS_MW, $row->rev_timestamp ), true );
@@ -207,7 +207,7 @@ class ContribsPager extends ReverseChronologicalPager {
                        $mflag = '';
                }
 
-               $ret = "$d ($difftext; $histtext) {$nflag}{$mflag} {$link}{$userlink}{$comment} $topmarktext";
+               $ret = "{$d} {$histlink} {$difftext} {$nflag}{$mflag} {$link}{$userlink}{$comment} {$topmarktext}";
                if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
                        $ret .= ' ' . wfMsgHtml( 'deletedrev' );
                }